Merge from origin/emacs-25

author Paul Eggert <eggert@cs.ucla.edu>

Mon, 18 Apr 2016 21:05:32 +0000 (14:05 -0700)

committer Paul Eggert <eggert@cs.ucla.edu>

Mon, 18 Apr 2016 21:05:32 +0000 (14:05 -0700)
author Paul Eggert <eggert@cs.ucla.edu>
Mon, 18 Apr 2016 21:05:32 +0000 (14:05 -0700)
committer Paul Eggert <eggert@cs.ucla.edu>
Mon, 18 Apr 2016 21:05:32 +0000 (14:05 -0700)
diff --cc configure.ac
Simple merge
diff --cc lisp/autorevert.el
Simple merge
author	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 18 Apr 2016 21:05:32 +0000 (14:05 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 18 Apr 2016 21:05:32 +0000 (14:05 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/autorevert.el	patch \|	diff1 \|	diff2 \|	blob \| history